﻿namespace PortableVersion
{
    partial class PendingChanges
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;

        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }

        #region Windows Form Designer generated code

        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PendingChanges));
            this.tabControl1 = new System.Windows.Forms.TabControl();
            this.TabNormal = new System.Windows.Forms.TabPage();
            this.GridSafeChanges = new System.Windows.Forms.DataGridView();
            this.fileDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.changeTypeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.Desc = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.DataSet = new System.Data.DataSet();
            this.SafeChanges = new System.Data.DataTable();
            this.dataColumn1 = new System.Data.DataColumn();
            this.dataColumn2 = new System.Data.DataColumn();
            this.dataColumn9 = new System.Data.DataColumn();
            this.Conflicts = new System.Data.DataTable();
            this.dataColumn3 = new System.Data.DataColumn();
            this.dataColumn4 = new System.Data.DataColumn();
            this.dataColumn5 = new System.Data.DataColumn();
            this.dataColumn6 = new System.Data.DataColumn();
            this.dataColumn7 = new System.Data.DataColumn();
            this.dataColumn8 = new System.Data.DataColumn();
            this.dataColumn10 = new System.Data.DataColumn();
            this.Errors = new System.Data.DataTable();
            this.dataColumn11 = new System.Data.DataColumn();
            this.dataColumn12 = new System.Data.DataColumn();
            this.dataColumn13 = new System.Data.DataColumn();
            this.dataColumn14 = new System.Data.DataColumn();
            this.TabConflicts = new System.Windows.Forms.TabPage();
            this.GridConflicts = new System.Windows.Forms.DataGridView();
            this.fileDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.ConflictType = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.slaveEventDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.masterEventDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.Resolution = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.MetaKey = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.ConflictActionMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
            this.MnuOverwrite = new System.Windows.Forms.ToolStripMenuItem();
            this.MnuIgnore = new System.Windows.Forms.ToolStripMenuItem();
            this.MnuMerge = new System.Windows.Forms.ToolStripMenuItem();
            this.tabPage1 = new System.Windows.Forms.TabPage();
            this.ErrorsGrid = new System.Windows.Forms.DataGridView();
            this.Comments = new System.Windows.Forms.TextBox();
            this.dataColumn15 = new System.Data.DataColumn();
            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.fileDataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.fileDataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.fileDataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.diffTypeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.slaveEventDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.masterEventDataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.descDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
            this.tabControl1.SuspendLayout();
            this.TabNormal.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.GridSafeChanges)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.DataSet)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.SafeChanges)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Conflicts)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Errors)).BeginInit();
            this.TabConflicts.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.GridConflicts)).BeginInit();
            this.ConflictActionMenu.SuspendLayout();
            this.tabPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.ErrorsGrid)).BeginInit();
            this.SuspendLayout();
            // 
            // tabControl1
            // 
            this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
                        | System.Windows.Forms.AnchorStyles.Left)
                        | System.Windows.Forms.AnchorStyles.Right)));
            this.tabControl1.Controls.Add(this.TabNormal);
            this.tabControl1.Controls.Add(this.TabConflicts);
            this.tabControl1.Controls.Add(this.tabPage1);
            this.tabControl1.Location = new System.Drawing.Point(2, 2);
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
            this.tabControl1.Size = new System.Drawing.Size(915, 501);
            this.tabControl1.TabIndex = 0;
            // 
            // TabNormal
            // 
            this.TabNormal.Controls.Add(this.GridSafeChanges);
            this.TabNormal.Location = new System.Drawing.Point(4, 22);
            this.TabNormal.Name = "TabNormal";
            this.TabNormal.Padding = new System.Windows.Forms.Padding(3);
            this.TabNormal.Size = new System.Drawing.Size(907, 475);
            this.TabNormal.TabIndex = 0;
            this.TabNormal.Text = "Normal Changes";
            this.TabNormal.UseVisualStyleBackColor = true;
            // 
            // GridSafeChanges
            // 
            this.GridSafeChanges.AllowUserToAddRows = false;
            this.GridSafeChanges.AllowUserToDeleteRows = false;
            this.GridSafeChanges.AutoGenerateColumns = false;
            this.GridSafeChanges.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
            this.GridSafeChanges.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.GridSafeChanges.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
            this.fileDataGridViewTextBoxColumn,
            this.changeTypeDataGridViewTextBoxColumn,
            this.Desc});
            this.GridSafeChanges.DataMember = "Safe Changes";
            this.GridSafeChanges.DataSource = this.DataSet;
            this.GridSafeChanges.Dock = System.Windows.Forms.DockStyle.Fill;
            this.GridSafeChanges.Location = new System.Drawing.Point(3, 3);
            this.GridSafeChanges.Name = "GridSafeChanges";
            this.GridSafeChanges.ReadOnly = true;
            this.GridSafeChanges.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
            this.GridSafeChanges.Size = new System.Drawing.Size(901, 469);
            this.GridSafeChanges.TabIndex = 0;
            this.GridSafeChanges.SelectionChanged += new System.EventHandler(this.GridSafeChanges_SelectionChanged);
            // 
            // fileDataGridViewTextBoxColumn
            // 
            this.fileDataGridViewTextBoxColumn.DataPropertyName = "File";
            this.fileDataGridViewTextBoxColumn.HeaderText = "File";
            this.fileDataGridViewTextBoxColumn.Name = "fileDataGridViewTextBoxColumn";
            this.fileDataGridViewTextBoxColumn.ReadOnly = true;
            this.fileDataGridViewTextBoxColumn.Width = 48;
            // 
            // changeTypeDataGridViewTextBoxColumn
            // 
            this.changeTypeDataGridViewTextBoxColumn.DataPropertyName = "ChangeType";
            this.changeTypeDataGridViewTextBoxColumn.HeaderText = "ChangeType";
            this.changeTypeDataGridViewTextBoxColumn.Name = "changeTypeDataGridViewTextBoxColumn";
            this.changeTypeDataGridViewTextBoxColumn.ReadOnly = true;
            this.changeTypeDataGridViewTextBoxColumn.Width = 93;
            // 
            // Desc
            // 
            this.Desc.DataPropertyName = "Desc";
            this.Desc.HeaderText = "Desc";
            this.Desc.Name = "Desc";
            this.Desc.ReadOnly = true;
            this.Desc.Visible = false;
            this.Desc.Width = 57;
            // 
            // DataSet
            // 
            this.DataSet.DataSetName = "SafeChanges";
            this.DataSet.Tables.AddRange(new System.Data.DataTable[] {
            this.SafeChanges,
            this.Conflicts,
            this.Errors});
            // 
            // SafeChanges
            // 
            this.SafeChanges.Columns.AddRange(new System.Data.DataColumn[] {
            this.dataColumn1,
            this.dataColumn2,
            this.dataColumn9});
            this.SafeChanges.TableName = "Safe Changes";
            // 
            // dataColumn1
            // 
            this.dataColumn1.ColumnName = "File";
            // 
            // dataColumn2
            // 
            this.dataColumn2.ColumnName = "ChangeType";
            // 
            // dataColumn9
            // 
            this.dataColumn9.ColumnName = "Desc";
            // 
            // Conflicts
            // 
            this.Conflicts.Columns.AddRange(new System.Data.DataColumn[] {
            this.dataColumn3,
            this.dataColumn4,
            this.dataColumn5,
            this.dataColumn6,
            this.dataColumn7,
            this.dataColumn8,
            this.dataColumn10});
            this.Conflicts.TableName = "Conflicts";
            // 
            // dataColumn3
            // 
            this.dataColumn3.ColumnName = "File";
            // 
            // dataColumn4
            // 
            this.dataColumn4.ColumnName = "Conflict Type";
            // 
            // dataColumn5
            // 
            this.dataColumn5.ColumnName = "Slave Event";
            // 
            // dataColumn6
            // 
            this.dataColumn6.ColumnName = "Master Event";
            // 
            // dataColumn7
            // 
            this.dataColumn7.ColumnName = "Resolution";
            // 
            // dataColumn8
            // 
            this.dataColumn8.ColumnName = "MetaKey";
            // 
            // dataColumn10
            // 
            this.dataColumn10.ColumnName = "Desc";
            // 
            // Errors
            // 
            this.Errors.Columns.AddRange(new System.Data.DataColumn[] {
            this.dataColumn11,
            this.dataColumn12,
            this.dataColumn13,
            this.dataColumn14,
            this.dataColumn15});
            this.Errors.TableName = "Errors";
            // 
            // dataColumn11
            // 
            this.dataColumn11.ColumnName = "File";
            // 
            // dataColumn12
            // 
            this.dataColumn12.ColumnName = "Slave Event";
            // 
            // dataColumn13
            // 
            this.dataColumn13.ColumnName = "Master Event";
            // 
            // dataColumn14
            // 
            this.dataColumn14.ColumnName = "Desc";
            // 
            // TabConflicts
            // 
            this.TabConflicts.Controls.Add(this.GridConflicts);
            this.TabConflicts.Location = new System.Drawing.Point(4, 22);
            this.TabConflicts.Name = "TabConflicts";
            this.TabConflicts.Padding = new System.Windows.Forms.Padding(3);
            this.TabConflicts.Size = new System.Drawing.Size(907, 475);
            this.TabConflicts.TabIndex = 1;
            this.TabConflicts.Text = "Conflicts";
            this.TabConflicts.UseVisualStyleBackColor = true;
            // 
            // GridConflicts
            // 
            this.GridConflicts.AllowUserToAddRows = false;
            this.GridConflicts.AllowUserToDeleteRows = false;
            this.GridConflicts.AutoGenerateColumns = false;
            this.GridConflicts.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
            this.GridConflicts.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.GridConflicts.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
            this.fileDataGridViewTextBoxColumn1,
            this.ConflictType,
            this.slaveEventDataGridViewTextBoxColumn,
            this.masterEventDataGridViewTextBoxColumn,
            this.Resolution,
            this.MetaKey,
            this.dataGridViewTextBoxColumn1});
            this.GridConflicts.ContextMenuStrip = this.ConflictActionMenu;
            this.GridConflicts.DataMember = "Conflicts";
            this.GridConflicts.DataSource = this.DataSet;
            this.GridConflicts.Dock = System.Windows.Forms.DockStyle.Fill;
            this.GridConflicts.Location = new System.Drawing.Point(3, 3);
            this.GridConflicts.Name = "GridConflicts";
            this.GridConflicts.ReadOnly = true;
            this.GridConflicts.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
            this.GridConflicts.Size = new System.Drawing.Size(901, 469);
            this.GridConflicts.TabIndex = 0;
            this.GridConflicts.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.GridConflicts_CellContentClick);
            this.GridConflicts.SelectionChanged += new System.EventHandler(this.GridSafeChanges_SelectionChanged);
            // 
            // fileDataGridViewTextBoxColumn1
            // 
            this.fileDataGridViewTextBoxColumn1.DataPropertyName = "File";
            this.fileDataGridViewTextBoxColumn1.HeaderText = "File";
            this.fileDataGridViewTextBoxColumn1.Name = "fileDataGridViewTextBoxColumn1";
            this.fileDataGridViewTextBoxColumn1.ReadOnly = true;
            this.fileDataGridViewTextBoxColumn1.Width = 48;
            // 
            // ConflictType
            // 
            this.ConflictType.DataPropertyName = "Conflict Type";
            this.ConflictType.HeaderText = "Conflict Type";
            this.ConflictType.Name = "ConflictType";
            this.ConflictType.ReadOnly = true;
            this.ConflictType.Width = 94;
            // 
            // slaveEventDataGridViewTextBoxColumn
            // 
            this.slaveEventDataGridViewTextBoxColumn.DataPropertyName = "Slave Event";
            this.slaveEventDataGridViewTextBoxColumn.HeaderText = "Slave Event";
            this.slaveEventDataGridViewTextBoxColumn.Name = "slaveEventDataGridViewTextBoxColumn";
            this.slaveEventDataGridViewTextBoxColumn.ReadOnly = true;
            this.slaveEventDataGridViewTextBoxColumn.Width = 90;
            // 
            // masterEventDataGridViewTextBoxColumn
            // 
            this.masterEventDataGridViewTextBoxColumn.DataPropertyName = "Master Event";
            this.masterEventDataGridViewTextBoxColumn.HeaderText = "Master Event";
            this.masterEventDataGridViewTextBoxColumn.Name = "masterEventDataGridViewTextBoxColumn";
            this.masterEventDataGridViewTextBoxColumn.ReadOnly = true;
            this.masterEventDataGridViewTextBoxColumn.Width = 95;
            // 
            // Resolution
            // 
            this.Resolution.DataPropertyName = "Resolution";
            this.Resolution.HeaderText = "Resolution";
            this.Resolution.Name = "Resolution";
            this.Resolution.ReadOnly = true;
            this.Resolution.Width = 82;
            // 
            // MetaKey
            // 
            this.MetaKey.DataPropertyName = "MetaKey";
            this.MetaKey.HeaderText = "MetaKey";
            this.MetaKey.Name = "MetaKey";
            this.MetaKey.ReadOnly = true;
            this.MetaKey.Visible = false;
            this.MetaKey.Width = 74;
            // 
            // dataGridViewTextBoxColumn1
            // 
            this.dataGridViewTextBoxColumn1.DataPropertyName = "Desc";
            this.dataGridViewTextBoxColumn1.HeaderText = "Desc";
            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
            this.dataGridViewTextBoxColumn1.ReadOnly = true;
            this.dataGridViewTextBoxColumn1.Visible = false;
            this.dataGridViewTextBoxColumn1.Width = 57;
            // 
            // ConflictActionMenu
            // 
            this.ConflictActionMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.MnuOverwrite,
            this.MnuIgnore,
            this.MnuMerge});
            this.ConflictActionMenu.Name = "ConflictActionMenu";
            this.ConflictActionMenu.Size = new System.Drawing.Size(193, 70);
            this.ConflictActionMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ConflictActionMenu_Opening);
            // 
            // MnuOverwrite
            // 
            this.MnuOverwrite.Name = "MnuOverwrite";
            this.MnuOverwrite.Size = new System.Drawing.Size(192, 22);
            this.MnuOverwrite.Text = "&Keep Slave (Overwrite)";
            this.MnuOverwrite.Click += new System.EventHandler(this.MnuOverwrite_Click);
            // 
            // MnuIgnore
            // 
            this.MnuIgnore.Name = "MnuIgnore";
            this.MnuIgnore.Size = new System.Drawing.Size(192, 22);
            this.MnuIgnore.Text = "Keep Master (&Ignore)";
            this.MnuIgnore.Click += new System.EventHandler(this.MnuIgnore_Click);
            // 
            // MnuMerge
            // 
            this.MnuMerge.Name = "MnuMerge";
            this.MnuMerge.Size = new System.Drawing.Size(192, 22);
            this.MnuMerge.Text = "Mer&ge in Merge Tool";
            this.MnuMerge.Click += new System.EventHandler(this.MnuMerge_Click);
            // 
            // tabPage1
            // 
            this.tabPage1.Controls.Add(this.ErrorsGrid);
            this.tabPage1.Location = new System.Drawing.Point(4, 22);
            this.tabPage1.Name = "tabPage1";
            this.tabPage1.Size = new System.Drawing.Size(907, 475);
            this.tabPage1.TabIndex = 2;
            this.tabPage1.Text = "Errors";
            this.tabPage1.UseVisualStyleBackColor = true;
            // 
            // ErrorsGrid
            // 
            this.ErrorsGrid.AllowUserToAddRows = false;
            this.ErrorsGrid.AllowUserToDeleteRows = false;
            this.ErrorsGrid.AutoGenerateColumns = false;
            this.ErrorsGrid.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;
            this.ErrorsGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.ErrorsGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
            this.fileDataGridViewTextBoxColumn4,
            this.diffTypeDataGridViewTextBoxColumn,
            this.slaveEventDataGridViewTextBoxColumn1,
            this.masterEventDataGridViewTextBoxColumn1,
            this.descDataGridViewTextBoxColumn});
            this.ErrorsGrid.DataMember = "Errors";
            this.ErrorsGrid.DataSource = this.DataSet;
            this.ErrorsGrid.Dock = System.Windows.Forms.DockStyle.Fill;
            this.ErrorsGrid.Location = new System.Drawing.Point(0, 0);
            this.ErrorsGrid.Name = "ErrorsGrid";
            this.ErrorsGrid.ReadOnly = true;
            this.ErrorsGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
            this.ErrorsGrid.Size = new System.Drawing.Size(907, 475);
            this.ErrorsGrid.TabIndex = 1;
            this.ErrorsGrid.SelectionChanged += new System.EventHandler(this.GridSafeChanges_SelectionChanged);
            // 
            // Comments
            // 
            this.Comments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
                        | System.Windows.Forms.AnchorStyles.Right)));
            this.Comments.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.DataSet, "Conflicts.Desc", true));
            this.Comments.Location = new System.Drawing.Point(2, 509);
            this.Comments.Multiline = true;
            this.Comments.Name = "Comments";
            this.Comments.ReadOnly = true;
            this.Comments.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
            this.Comments.Size = new System.Drawing.Size(910, 102);
            this.Comments.TabIndex = 1;
            // 
            // dataColumn15
            // 
            this.dataColumn15.ColumnName = "Diff Type";
            // 
            // dataGridViewTextBoxColumn2
            // 
            this.dataGridViewTextBoxColumn2.DataPropertyName = "File";
            this.dataGridViewTextBoxColumn2.HeaderText = "File";
            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
            this.dataGridViewTextBoxColumn2.Width = 48;
            // 
            // fileDataGridViewTextBoxColumn2
            // 
            this.fileDataGridViewTextBoxColumn2.DataPropertyName = "File";
            this.fileDataGridViewTextBoxColumn2.HeaderText = "File";
            this.fileDataGridViewTextBoxColumn2.Name = "fileDataGridViewTextBoxColumn2";
            this.fileDataGridViewTextBoxColumn2.Width = 48;
            // 
            // fileDataGridViewTextBoxColumn3
            // 
            this.fileDataGridViewTextBoxColumn3.DataPropertyName = "File";
            this.fileDataGridViewTextBoxColumn3.HeaderText = "File";
            this.fileDataGridViewTextBoxColumn3.Name = "fileDataGridViewTextBoxColumn3";
            this.fileDataGridViewTextBoxColumn3.Width = 48;
            // 
            // fileDataGridViewTextBoxColumn4
            // 
            this.fileDataGridViewTextBoxColumn4.DataPropertyName = "File";
            this.fileDataGridViewTextBoxColumn4.HeaderText = "File";
            this.fileDataGridViewTextBoxColumn4.Name = "fileDataGridViewTextBoxColumn4";
            this.fileDataGridViewTextBoxColumn4.ReadOnly = true;
            this.fileDataGridViewTextBoxColumn4.Width = 48;
            // 
            // diffTypeDataGridViewTextBoxColumn
            // 
            this.diffTypeDataGridViewTextBoxColumn.DataPropertyName = "Diff Type";
            this.diffTypeDataGridViewTextBoxColumn.HeaderText = "Diff Type";
            this.diffTypeDataGridViewTextBoxColumn.Name = "diffTypeDataGridViewTextBoxColumn";
            this.diffTypeDataGridViewTextBoxColumn.ReadOnly = true;
            this.diffTypeDataGridViewTextBoxColumn.Width = 75;
            // 
            // slaveEventDataGridViewTextBoxColumn1
            // 
            this.slaveEventDataGridViewTextBoxColumn1.DataPropertyName = "Slave Event";
            this.slaveEventDataGridViewTextBoxColumn1.HeaderText = "Slave Event";
            this.slaveEventDataGridViewTextBoxColumn1.Name = "slaveEventDataGridViewTextBoxColumn1";
            this.slaveEventDataGridViewTextBoxColumn1.ReadOnly = true;
            this.slaveEventDataGridViewTextBoxColumn1.Width = 90;
            // 
            // masterEventDataGridViewTextBoxColumn1
            // 
            this.masterEventDataGridViewTextBoxColumn1.DataPropertyName = "Master Event";
            this.masterEventDataGridViewTextBoxColumn1.HeaderText = "Master Event";
            this.masterEventDataGridViewTextBoxColumn1.Name = "masterEventDataGridViewTextBoxColumn1";
            this.masterEventDataGridViewTextBoxColumn1.ReadOnly = true;
            this.masterEventDataGridViewTextBoxColumn1.Width = 95;
            // 
            // descDataGridViewTextBoxColumn
            // 
            this.descDataGridViewTextBoxColumn.DataPropertyName = "Desc";
            this.descDataGridViewTextBoxColumn.HeaderText = "Desc";
            this.descDataGridViewTextBoxColumn.Name = "descDataGridViewTextBoxColumn";
            this.descDataGridViewTextBoxColumn.ReadOnly = true;
            this.descDataGridViewTextBoxColumn.Visible = false;
            this.descDataGridViewTextBoxColumn.Width = 57;
            // 
            // PendingChanges
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(919, 613);
            this.Controls.Add(this.Comments);
            this.Controls.Add(this.tabControl1);
            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
            this.Name = "PendingChanges";
            this.Text = "PendingChanges";
            this.tabControl1.ResumeLayout(false);
            this.TabNormal.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.GridSafeChanges)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.DataSet)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.SafeChanges)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Conflicts)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Errors)).EndInit();
            this.TabConflicts.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.GridConflicts)).EndInit();
            this.ConflictActionMenu.ResumeLayout(false);
            this.tabPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.ErrorsGrid)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();

        }

        #endregion

        private System.Windows.Forms.TabControl tabControl1;
        private System.Windows.Forms.TabPage TabNormal;
        private System.Windows.Forms.TabPage TabConflicts;
        private System.Windows.Forms.TextBox Comments;
        private System.Windows.Forms.DataGridView GridSafeChanges;
        private System.Windows.Forms.DataGridView GridConflicts;
        private System.Data.DataSet DataSet;
        private System.Data.DataTable SafeChanges;
        private System.Data.DataColumn dataColumn1;
        private System.Data.DataColumn dataColumn2;
        private System.Data.DataTable Conflicts;
        private System.Data.DataColumn dataColumn3;
        private System.Data.DataColumn dataColumn4;
        private System.Data.DataColumn dataColumn5;
        private System.Data.DataColumn dataColumn6;
        private System.Data.DataColumn dataColumn7;
        private System.Data.DataColumn dataColumn8;
        private System.Windows.Forms.ContextMenuStrip ConflictActionMenu;
        private System.Windows.Forms.ToolStripMenuItem MnuOverwrite;
        private System.Windows.Forms.ToolStripMenuItem MnuIgnore;
        private System.Windows.Forms.ToolStripMenuItem MnuMerge;
        private System.Data.DataColumn dataColumn9;
        private System.Data.DataColumn dataColumn10;
        private System.Windows.Forms.DataGridViewTextBoxColumn fileDataGridViewTextBoxColumn;
        private System.Windows.Forms.DataGridViewTextBoxColumn changeTypeDataGridViewTextBoxColumn;
        private System.Windows.Forms.DataGridViewTextBoxColumn Desc;
        private System.Windows.Forms.DataGridViewTextBoxColumn fileDataGridViewTextBoxColumn1;
        private System.Windows.Forms.DataGridViewTextBoxColumn ConflictType;
        private System.Windows.Forms.DataGridViewTextBoxColumn slaveEventDataGridViewTextBoxColumn;
        private System.Windows.Forms.DataGridViewTextBoxColumn masterEventDataGridViewTextBoxColumn;
        private System.Windows.Forms.DataGridViewTextBoxColumn Resolution;
        private System.Windows.Forms.DataGridViewTextBoxColumn MetaKey;
        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
        private System.Data.DataTable Errors;
        private System.Data.DataColumn dataColumn11;
        private System.Data.DataColumn dataColumn12;
        private System.Data.DataColumn dataColumn13;
        private System.Data.DataColumn dataColumn14;
        private System.Windows.Forms.TabPage tabPage1;
        private System.Windows.Forms.DataGridView ErrorsGrid;
        private System.Data.DataColumn dataColumn15;
        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
        private System.Windows.Forms.DataGridViewTextBoxColumn fileDataGridViewTextBoxColumn2;
        private System.Windows.Forms.DataGridViewTextBoxColumn fileDataGridViewTextBoxColumn3;
        private System.Windows.Forms.DataGridViewTextBoxColumn fileDataGridViewTextBoxColumn4;
        private System.Windows.Forms.DataGridViewTextBoxColumn diffTypeDataGridViewTextBoxColumn;
        private System.Windows.Forms.DataGridViewTextBoxColumn slaveEventDataGridViewTextBoxColumn1;
        private System.Windows.Forms.DataGridViewTextBoxColumn masterEventDataGridViewTextBoxColumn1;
        private System.Windows.Forms.DataGridViewTextBoxColumn descDataGridViewTextBoxColumn;
    }
}